Couple of changes to make it easier to compile rustc for wasm #130899
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.
|
r? @davidtwco rustbot has assigned @davidtwco. Use |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
wasi_bootstrap_fixes
branch
from
dd7dfe8 to
ee6d837
Compare
This comment has been minimized.
This comment has been minimized.
bjorn3
force-pushed
the
wasi_bootstrap_fixes
branch
from
ee6d837 to
bf1f5c9
Compare
|
Added a couple more fixes. |
davidtwco
approved these changes
Oct 7, 2024
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 7, 2024
…kingjubilee Rollup of 7 pull requests Successful merges: - rust-lang#128721 (Don't allow the `#[pointee]` attribute where it doesn't belong) - rust-lang#130479 (skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on) - rust-lang#130899 (Couple of changes to make it easier to compile rustc for wasm) - rust-lang#131225 (`rustc_borrowck` memory management tweaks) - rust-lang#131351 (Remove valgrind test suite and support from compiletest, bootstrap and opt-dist) - rust-lang#131359 (Fix used_underscore_binding in rustc_serialize) - rust-lang#131367 (Mark Boxy as on vacation) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 7, 2024
Rollup merge of rust-lang#130899 - bjorn3:wasi_bootstrap_fixes, r=davidtwco Couple of changes to make it easier to compile rustc for wasm This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.
|
I'm guessing this didn't fail in CI as we default to using rpaths, while these distros/OSes don't? |
|
Most likely yeah. |
onur-ozkan
reviewed
Jan 30, 2025
Comment on lines
-1688
to
+1703
| cargo.arg("-Zdual-proc-macros"); | ||
| rustflags.arg("-Zdual-proc-macros"); | ||
| let error = command(self.rustc(compiler)) | ||
| .arg("--target") | ||
| .arg(target.rustc_target_arg()) | ||
| .arg("--print=file-names") | ||
| .arg("--crate-type=proc-macro") | ||
| .arg("-") | ||
| .run_capture(self) | ||
| .stderr(); | ||
| let not_supported = error | ||
| .lines() | ||
| .any(|line| line.contains("unsupported crate type `proc-macro`")); | ||
| if !not_supported { | ||
| cargo.arg("-Zdual-proc-macros"); | ||
| rustflags.arg("-Zdual-proc-macros"); | ||
| } |
There was a problem hiding this comment.
Would adding rpath check here fix the regression?
There was a problem hiding this comment.
I think self.rustc() may be missing code to set LD_LIBRARY_PATH. If LD_LIBRARY_PATH is set correctly it should work even with rpath disabled.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.